Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 9 Jul 2010 01:02:18 +0000 (01:02 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 9 Jul 2010 01:02:18 +0000 (01:02 +0000)

Trivial merge